Issue #424 - Fixed city name cycling#852
Merged
stavrosfa merged 2 commits intoC7-Game:Developmentfrom Jan 7, 2026
Merged
Conversation
City names will be reused now if player prompted a plant but cancelled. The proposed city name will now be the earliest entry in a civilization's city names that is not currently used by a city.
stavrosfa
reviewed
Jan 6, 2026
Contributor
|
If cityNameIndex is unused I would remove it completely from the code + json save files |
Contributor
|
Also completely unrelated in terms of code, but I am sad to see this bug/feature go after 20 years of loving to hate it 😅 |
stavrosfa
approved these changes
Jan 7, 2026
Contributor
|
I am approving, I have also tested it locally around, seems to be ok, if anyone else has any comments, I will leave it here for a while, and then merge it |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
City names will be reused now if player prompted a plant but cancelled. The proposed city name will now be the earliest entry in a civilization's city names that is not currently used by a city, following Civ 3 naming conventions for new loops over the cities (i.e. Athens, New Athens, Athens 2, New Athens 2, etc)
The property
int cityNameIndexis no longer used in thePlayerclass (or anywhere else from what I could tell), but I left in since there appear to be many references throughout the codebase assigning cityNameIndex when instantiating Player objects, and I didn't want to do anything destructive at this time.